Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable20.1] Add upload editor in files sidebar mode #5113

Merged
merged 5 commits into from
Feb 9, 2021

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Feb 9, 2021

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #4535

@backportbot-nextcloud backportbot-nextcloud bot added bug feature: talk-sidebar ⬅️ Sidebar integration of Talk into other apps like sharing and documents regression labels Feb 9, 2021
@backportbot-nextcloud backportbot-nextcloud bot added this to the 💙 Next Patch (20.1) milestone Feb 9, 2021
PVince81 and others added 5 commits February 9, 2021 17:46
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
The upload editor is shown based on both "showUploadEditor" (set in the
store) and "modalDismissed" (set in the component). As "modalDismissed"
is initially false and "showUploadEditor" was not cleared after an
upload started or was discarded this caused the upload editor to be
immediately shown if mounted again (for example, when joining a
conversation in the Files app sidebar) if a previous upload was
initialised.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
As "showUploadEditor" is now properly updated in the store when an
upload starts or discarded the "modalDismissed" property of the
component is redundant and can be removed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
As "showUploadEditor" is true only when "currentUploadId" is set and
false otherwise there is no need to use a separate variable.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@PVince81 PVince81 force-pushed the backport/4535/stable20.1 branch from 3be0438 to 87918f2 Compare February 9, 2021 16:51
@PVince81 PVince81 self-assigned this Feb 9, 2021
@PVince81
Copy link
Member

PVince81 commented Feb 9, 2021

conflicts solved

next up: testing

Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Tested, works

@PVince81 PVince81 merged commit c1d0547 into stable20.1 Feb 9, 2021
@PVince81 PVince81 deleted the backport/4535/stable20.1 branch February 9, 2021 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug feature: talk-sidebar ⬅️ Sidebar integration of Talk into other apps like sharing and documents regression
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants